[IA64] Remove kludge in Makefile to build asm-xsi-offsets.h

Add missing include files in HDRS

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index 36d190714884736eeeb4f5f85301f664f331de1c..d9f8767a06e208441dde1000d47d88779ea4497e 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -21,9 +21,12 @@ $(TARGET): $(TARGET)-syms
        $(NM) -n $(TARGET)-syms | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)'\
                 > $(BASEDIR)/System.map
 
+# Headers do not depend on auto-generated header, but object files do.
 HDRS    := $(subst $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h,,$(HDRS))
-asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
-       $(CC) $(CFLAGS) -S -o $@ $<
+$(ALL_OBJS): $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
+
+asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp
+       $(CC) $(CFLAGS) -DGENERATE_ASM_OFFSETS -DIA64_TASK_SIZE=0 -S -o $@ $<
 
 asm-xsi-offsets.s: asm-xsi-offsets.c $(HDRS)
        $(CC) $(CFLAGS) -S -o $@ $<
@@ -63,14 +66,6 @@ $(BASEDIR)/include/asm-ia64/.offsets.h.stamp:
         || ln -s ../../../include/asm-x86/hvm/vioapic.h $(BASEDIR)/include/asm-ia64/hvm/vioapic.h
        [ -e $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c ] \
         || ln -s ../../../arch/x86/hvm/vioapic.c $(BASEDIR)/arch/ia64/vmx/hvm_vioapic.c
-# Solve circular reference on asm-offsets.h
-       [ -f $(BASEDIR)/include/asm-ia64/asm-offsets.h ] \
-        || echo "#define IA64_TASK_SIZE 0" > $(BASEDIR)/include/asm-ia64/asm-offsets.h
-       [ -f $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h ] \
-        || touch $(BASEDIR)/include/asm-ia64/asm-xsi-offsets.h
-#Bad hack. Force asm-offsets.h out-of-date
-        sleep 1
-        touch $@
 
 # I'm sure a Makefile wizard would know a better way to do this
 xen.lds.s: xen/xen.lds.S

diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk
index e6ae9a50a97fcd2b375f57d212ad066e4780c8c7..777fc4d6d6a6c9c8e593cf0e8f73d31d821e5448 100644 (file)
--- a/xen/arch/ia64/Rules.mk
+++ b/xen/arch/ia64/Rules.mk
@@ -44,3 +44,16 @@ CFLAGS       += -Wa,--fatal-warnings -Werror -Wno-uninitialized
 endif
 
 LDFLAGS := -g
+
+# Additionnal IA64 include dirs.
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/asm/sn/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-null/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/asm/sn/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux-xen/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm-generic/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/asm/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/linux/byteorder/*.h)
+HDRS += $(wildcard $(BASEDIR)/include/asm-ia64/hvm/*.h)

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 3d1983add8f0fd3e72d6830e3b25f52df7612ab3..e9766890e55ae3f944cc9f1baa9276c48ac70b62 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -24,6 +24,7 @@
 #include <xen/softirq.h>
 #include <xen/mm.h>
 #include <xen/iocap.h>
+#include <asm/asm-xsi-offsets.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/xen/arch/ia64/xen/faults.c b/xen/arch/ia64/xen/faults.c
index ac16d3a32e6067c4f9e4eab2264254f153b61fc2..3dad416ae79e5ec59bc3a12e7d10397271b572ff 100644 (file)
--- a/xen/arch/ia64/xen/faults.c
+++ b/xen/arch/ia64/xen/faults.c
@@ -26,6 +26,7 @@
 #include <asm/vhpt.h>
 #include <asm/debugger.h>
 #include <asm/fpswa.h>
+#include <asm/asm-xsi-offsets.h>
 
 extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 /* FIXME: where these declarations shold be there ? */

diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S
index 443fde9249168b123becabbff8365b95f134f96f..5a2e2889943521bf23a99093acec8baf70a53cd6 100644 (file)
--- a/xen/arch/ia64/xen/hyperprivop.S
+++ b/xen/arch/ia64/xen/hyperprivop.S
@@ -13,6 +13,7 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/debugger.h>
+#include <asm/asm-xsi-offsets.h>
 #include <public/arch-ia64.h>
 
 

diff --git a/xen/arch/ia64/xen/xenasm.S b/xen/arch/ia64/xen/xenasm.S
index 4b12c706ae5292cb21da3d4fc616438d57fe3934..7400c882dba65e62ede238f466c725e378a760a7 100644 (file)
--- a/xen/arch/ia64/xen/xenasm.S
+++ b/xen/arch/ia64/xen/xenasm.S
@@ -10,6 +10,7 @@
 #include <asm/processor.h>
 #include <asm/pgtable.h>
 #include <asm/vhpt.h>
+#include <asm/asm-xsi-offsets.h>
 #include <public/arch-ia64.h>
        
 // Change rr7 to the passed value while ensuring

diff --git a/xen/include/asm-ia64/offsets.h b/xen/include/asm-ia64/offsets.h
index 7e3edc70d17db4a7059b2715fc6c242e9e5a51e6..dfc66d76a4979bc2ff08cf9ab91872b75c4a681b 100644 (file)
--- a/xen/include/asm-ia64/offsets.h
+++ b/xen/include/asm-ia64/offsets.h
@@ -2,7 +2,8 @@
 #ifndef __IA64_OFFSETS_H
 #define __IA64_OFFSETS_H
 
+#ifndef GENERATE_ASM_OFFSETS
 #include <asm/asm-offsets.h>
-#include <asm/asm-xsi-offsets.h>
+#endif
 
 #endif /* __IA64_OFFSETS_H */